@@ -27,29 +27,30 @@ class Command(CompatibilityBaseCommand): |
||
27 | 27 |
# 'amount': amount, |
28 | 28 |
# }) |
29 | 29 |
k, v = r.blpopjson(REDPACK_WAITING_SEND_LIST, 60) |
30 |
- if v: |
|
30 |
+ if not v: |
|
31 |
+ continue |
|
31 | 32 |
|
32 |
- close_old_connections() |
|
33 |
+ close_old_connections() |
|
33 | 34 |
|
34 |
- logger.info(v) |
|
35 |
+ logger.info(v) |
|
35 | 36 |
|
36 |
- with transaction.atomic(): |
|
37 |
- try: |
|
38 |
- elog = MchInfoEncryptLogInfo.objects.select_for_update().get(sn=v.get('sn', '')) |
|
39 |
- except MchInfoEncryptLogInfo.DoesNotExist: |
|
40 |
- continue |
|
41 |
- except MchInfoEncryptLogInfo.MultipleObjectsReturned: |
|
42 |
- continue |
|
37 |
+ with transaction.atomic(): |
|
38 |
+ try: |
|
39 |
+ elog = MchInfoEncryptLogInfo.objects.select_for_update().get(sn=v.get('sn', '')) |
|
40 |
+ except MchInfoEncryptLogInfo.DoesNotExist: |
|
41 |
+ continue |
|
42 |
+ except MchInfoEncryptLogInfo.MultipleObjectsReturned: |
|
43 |
+ continue |
|
43 | 44 |
|
44 |
- try: |
|
45 |
- user = UserInfo.objects.get(user_id=v.get('user_id', '')) |
|
46 |
- except UserInfo.DoesNotExist: |
|
47 |
- continue |
|
45 |
+ try: |
|
46 |
+ user = UserInfo.objects.get(user_id=v.get('user_id', '')) |
|
47 |
+ except UserInfo.DoesNotExist: |
|
48 |
+ continue |
|
48 | 49 |
|
49 |
- if not user.openid: |
|
50 |
- r.rpushjson(REDPACK_WAITING_SEND_LIST, v) |
|
51 |
- continue |
|
50 |
+ if not user.openid: |
|
51 |
+ r.rpushjson(REDPACK_WAITING_SEND_LIST, v) |
|
52 |
+ continue |
|
52 | 53 |
|
53 |
- exec_send_jsapi_hb(user, elog, v.get('amount', 100)) |
|
54 |
+ exec_send_jsapi_hb(user, elog, v.get('amount', 100)) |
|
54 | 55 |
|
55 |
- close_old_connections() |
|
56 |
+ close_old_connections() |